Auto merge of #3795 - jryans:template-year, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 6 Mar 2017 20:42:29 +0000 (20:42 +0000)
committerbors <bors@rust-lang.org>
Mon, 6 Mar 2017 20:42:29 +0000 (20:42 +0000)
Add year to project template variables

This adds the current year as a `year` variable for project templates. Some license files / headers include the year, so this should make it easier to include those in a template.

1  2 
Cargo.lock
Cargo.toml
src/cargo/ops/cargo_new.rs
tests/new.rs

diff --cc Cargo.lock
Simple merge
diff --cc Cargo.toml
Simple merge
Simple merge
diff --cc tests/new.rs
Simple merge